Add functions strupper and strlower.

diff --git a/defs.h b/defs.h
index 4a0aff6993b8eb216b9737ccca26b0e4a34cfb88..e7b23d4817677aaca52be71670f98d63d8f2acdf 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -661,6 +661,8 @@ char *xstrrstr(const char *s1, const char *s2);
 void rtrim(char *s);
 char * lrtrim(char *s);
 int xasprintf(char **strp, const char *fmt, ...);
+char *strupper(char *src);
+char *strlower(char *src);
 signed int get_tz_offset(void);
 time_t mkgmtime(struct tm *t);
 time_t current_time(void);

diff --git a/util.c b/util.c
index 080b555e24d1028e9f0ac8ca5cb50cd306a0a559..f0974d4234a443b985c2cf7708f252641b2907f4 100644 (file)
--- a/util.c
+++ b/util.c
@@ -495,13 +495,11 @@ str_match(const char *str, const char *match)
 int
 case_ignore_str_match(const char *str, const char *match)
 {
-       char *s1, *s2, *c;
+       char *s1, *s2;
        int res;
        
-       s1 = xstrdup(str);
-       for (c = s1; *c; c++) *c = toupper(*c);
-       s2 = xstrdup(match);
-       for (c = s2; *c; c++) *c = toupper(*c);
+       s1 = strupper(xstrdup(str));
+       s2 = strupper(xstrdup(match));
        res = str_match(s1, s2);
        xfree(s1);
        xfree(s2);
@@ -907,6 +905,33 @@ xstrrstr(const char *s1, const char *s2)
        return r;
 }
 
+/*
+ *
+ */
+char *
+strupper(char *src)
+{
+       char *c;
+       
+       for (c = src; *c; c++) {
+               *c = toupper(*c);
+       }
+       return src;
+}
+
+/*
+ *
+ */
+char *
+strlower(char *src)
+{
+       char *c;
+       
+       for (c = src; *c; c++) {
+               *c = tolower(*c);
+       }
+       return src;
+}
 
 char *
 rot13( const char *s )
@@ -1103,12 +1128,8 @@ strip_nastyhtml(const char * in)
        char *lcstr, *lcp;
        
        sp = returnstr = xstrdup(in);
-       lcp = lcstr = xstrdup(in);
+       lcp = lcstr = strlower(xstrdup(in));
        
-       while (*lcp) {
-               *lcp = tolower(*lcp);
-               lcp++;
-       }
        while (lcp = strstr(lcstr, "<body")) {   /* becomes <---- */
                sp = returnstr + (lcp - lcstr) ;
                sp++; *sp++ = '-'; *sp++ = '-'; *sp++ = '-'; *sp++ = '-';